error: commit is a merge but no -m

https://segmentfault.com/q/1010000010185984 執行git cherry-pick commitID操作時報錯，如題 原因是合並的commitID做過mer ...